ci/rpmostree: Bump to 2019.4
authorDan Nicholson <nicholson@endlessm.com>
Tue, 21 Jan 2020 21:56:31 +0000 (14:56 -0700)
committerDan Nicholson <nicholson@endlessm.com>
Wed, 22 Jan 2020 03:33:58 +0000 (20:33 -0700)
The vmcheck tests in 2019.3 fail because of an SSH control socket issue
on overlayfs. This is fixed in 2019.4[1]. That has some other changes
such as using Python 3 in tests. The package dependencies have been
synced from the rpm-ostree CI for that.

Unfortunately, this is no longer a totally representative test of f29
since it has 2019.3 in updates. But that's the price you pay for
exercising someone else's CI from your own CI.

1. https://github.com/coreos/rpm-ostree/commit/c89f81c1385ef095616b0e7001926572a20057b2

Fixes: #1994
ci/rpmostree.sh

index 76841ffe5e4d51d051f4c07e0f15deeea4147904..27fefaf6caeee98afc8e1ecefd9f2d8fa5bac73d 100755 (executable)
@@ -6,7 +6,7 @@ set -xeuo pipefail
 # Frozen to a tag for now to help predictability; it's
 # also useful to test building *older* versions since
 # that must work.
-RPMOSTREE_TAG=v2019.3
+RPMOSTREE_TAG=v2019.4
 
 dn=$(dirname $0)
 . ${dn}/libpaprci/libbuild.sh
@@ -18,12 +18,14 @@ pkg_install_buildroot
 pkg_builddep ostree rpm-ostree
 pkg_install rpm-ostree && rpm -e rpm-ostree
 
-# Duplicate of deps from build.sh in rpm-ostree for tests
-pkg_install ostree{,-devel,-grub2} createrepo_c /usr/bin/jq PyYAML \
-            libubsan libasan libtsan elfutils fuse sudo python-gobject-base \
-            selinux-policy-devel selinux-policy-targeted openssh-clients ansible
-# This one is in the papr.yml
-pkg_install rsync
+# Duplicate of deps from ci/installdeps.sh in rpm-ostree for tests
+pkg_install ostree{,-devel,-grub2} createrepo_c /usr/bin/jq python3-pyyaml \
+    libubsan libasan libtsan elfutils fuse sudo python3-gobject-base \
+    selinux-policy-devel selinux-policy-targeted python3-createrepo_c \
+    rsync python3-rpm parallel clang rustfmt-preview
+
+# From rpm-ostree/ci/vmcheck-provision.sh
+pkg_install openssh-clients ansible
 
 # build+install ostree
 cd ${codedir}